merge
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Fri, 24 Feb 2006 22:41:08 +0000 (15:41 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Fri, 24 Feb 2006 22:41:08 +0000 (15:41 -0700)
commit3a310f793dbd43b4cc8b1095aa6f7faa67595b04
treed0d55202ee586434811a96c149a8065c153fc7cd
parent40bb7e962a1322345952d7acb24f506bb181b5d9
parente6e48842c28f3a4974a35a275ffad25dfaa6eb46
merge
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
xen/arch/ia64/vmx/mmio.c
xen/arch/ia64/vmx/vmx_init.c
xen/arch/ia64/xen/process.c
xen/arch/ia64/xen/xenmisc.c
xen/include/asm-ia64/vmx.h